const Params = imports.misc.params;
const ShellEntry = imports.ui.shellEntry;
const UserWidget = imports.ui.userWidget;
-const Util = imports.misc.util;
+const {wiggle} = imports.misc.animationUtils;
var DEFAULT_BUTTON_WELL_ICON_SIZE = 16;
var DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1000;
this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
if (wasQueryingService)
- Util.wiggle(this._entry);
+ wiggle(this._entry);
}
_onVerificationComplete() {
this._message.opacity = 0;
}
- Util.wiggle(this._message, wiggleParameters);
+ wiggle(this._message, wiggleParameters);
}
updateSensitivity(sensitive) {
<file>gdm/realmd.js</file>
<file>gdm/util.js</file>
+ <file>misc/animationUtils.js</file>
<file>misc/config.js</file>
<file>misc/extensionUtils.js</file>
<file>misc/fileUtils.js</file>
--- /dev/null
+/* exported adjustAnimationTime, ensureActorVisibleInScrollView, wiggle */
+
+const St = imports.gi.St;
+const Clutter = imports.gi.Clutter;
+
+const Params = imports.misc.params;
+
+var SCROLL_TIME = 100;
+
+const WIGGLE_OFFSET = 6;
+const WIGGLE_DURATION = 65;
+const N_WIGGLES = 3;
+
+/**
+ * adjustAnimationTime:
+ *
+ * @param {number} msecs - time in milliseconds
+ *
+ * Adjust `msecs` to account for St's enable-animations
+ * and slow-down-factor settings
+ */
+function adjustAnimationTime(msecs) {
+ const settings = St.Settings.get();
+
+ if (!settings.enable_animations)
+ return 0;
+ return settings.slow_down_factor * msecs;
+}
+
+/**
+ * Animate scrolling a scrollview until an actor is visible.
+ *
+ * @param {St.ScrollView} scrollView - the scroll view the actor is in
+ * @param {Clutter.Actor} actor - the actor
+ */
+function ensureActorVisibleInScrollView(scrollView, actor) {
+ const {adjustment} = scrollView.vscroll;
+ let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();
+
+ let offset = 0;
+ const vfade = scrollView.get_effect('fade');
+ if (vfade)
+ offset = vfade.fade_margins.top;
+
+ let box = actor.get_allocation_box();
+ let y1 = box.y1, y2 = box.y2;
+
+ let parent = actor.get_parent();
+ while (parent !== scrollView) {
+ if (!parent)
+ throw new Error('actor not in scroll view');
+
+ box = parent.get_allocation_box();
+ y1 += box.y1;
+ y2 += box.y1;
+ parent = parent.get_parent();
+ }
+
+ if (y1 < value + offset)
+ value = Math.max(0, y1 - offset);
+ else if (y2 > value + pageSize - offset)
+ value = Math.min(upper, y2 + offset - pageSize);
+ else
+ return;
+
+ adjustment.ease(value, {
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+ duration: SCROLL_TIME,
+ });
+}
+
+/**
+ * "Wiggles" a clutter actor. A "wiggle" is an animation the moves an actor
+ * back and forth on the X axis a specified amount of times.
+ *
+ * @param {Clutter.Actor} actor - an actor to animate
+ * @param {object} params - options for the animation
+ * @param {number} params.offset - the offset to move the actor by per-wiggle
+ * @param {number} params.duration - the amount of time to move the actor per-wiggle
+ * @param {number} params.wiggleCount - the number of times to wiggle the actor
+ */
+function wiggle(actor, params) {
+ if (!St.Settings.get().enable_animations)
+ return;
+
+ params = Params.parse(params, {
+ offset: WIGGLE_OFFSET,
+ duration: WIGGLE_DURATION,
+ wiggleCount: N_WIGGLES,
+ });
+ actor.translation_x = 0;
+
+ // Accelerate before wiggling
+ actor.ease({
+ translation_x: -params.offset,
+ duration: params.duration,
+ mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+ onComplete: () => {
+ // Wiggle
+ actor.ease({
+ translation_x: params.offset,
+ duration: params.duration,
+ mode: Clutter.AnimationMode.LINEAR,
+ repeatCount: params.wiggleCount,
+ autoReverse: true,
+ onComplete: () => {
+ // Decelerate and return to the original position
+ actor.ease({
+ translation_x: 0,
+ duration: params.duration,
+ mode: Clutter.AnimationMode.EASE_IN_QUAD,
+ });
+ },
+ });
+ },
+ });
+}
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
/* exported findUrls, spawn, spawnCommandLine, spawnApp, trySpawnCommandLine,
- createTimeLabel, insertSorted, ensureActorVisibleInScrollView,
- wiggle, lerp, GNOMEversionCompare, DBusSenderChecker, Highlighter */
+ createTimeLabel, insertSorted, lerp, GNOMEversionCompare,
+ DBusSenderChecker, Highlighter */
-const Clutter = imports.gi.Clutter;
const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib;
const Shell = imports.gi.Shell;
const GnomeDesktop = imports.gi.GnomeDesktop;
const Main = imports.ui.main;
-const Params = imports.misc.params;
const {formatTime} = imports.misc.dateUtils;
-var SCROLL_TIME = 100;
-
-const WIGGLE_OFFSET = 6;
-const WIGGLE_DURATION = 65;
-const N_WIGGLES = 3;
-
// http://daringfireball.net/2010/07/improved_regex_for_matching_urls
const _balancedParens = '\\([^\\s()<>]+\\)';
const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
return pos;
}
-function ensureActorVisibleInScrollView(scrollView, actor) {
- let adjustment = scrollView.vscroll.adjustment;
- let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();
-
- let offset = 0;
- let vfade = scrollView.get_effect("fade");
- if (vfade)
- offset = vfade.fade_margins.top;
-
- let box = actor.get_allocation_box();
- let y1 = box.y1, y2 = box.y2;
-
- let parent = actor.get_parent();
- while (parent != scrollView) {
- if (!parent)
- throw new Error("actor not in scroll view");
-
- box = parent.get_allocation_box();
- y1 += box.y1;
- y2 += box.y1;
- parent = parent.get_parent();
- }
-
- if (y1 < value + offset)
- value = Math.max(0, y1 - offset);
- else if (y2 > value + pageSize - offset)
- value = Math.min(upper, y2 + offset - pageSize);
- else
- return;
-
- adjustment.ease(value, {
- mode: Clutter.AnimationMode.EASE_OUT_QUAD,
- duration: SCROLL_TIME,
- });
-}
-
-function wiggle(actor, params) {
- if (!St.Settings.get().enable_animations)
- return;
-
- params = Params.parse(params, {
- offset: WIGGLE_OFFSET,
- duration: WIGGLE_DURATION,
- wiggleCount: N_WIGGLES,
- });
- actor.translation_x = 0;
-
- // Accelerate before wiggling
- actor.ease({
- translation_x: -params.offset,
- duration: params.duration,
- mode: Clutter.AnimationMode.EASE_OUT_QUAD,
- onComplete: () => {
- // Wiggle
- actor.ease({
- translation_x: params.offset,
- duration: params.duration,
- mode: Clutter.AnimationMode.LINEAR,
- repeatCount: params.wiggleCount,
- autoReverse: true,
- onComplete: () => {
- // Decelerate and return to the original position
- actor.ease({
- translation_x: 0,
- duration: params.duration,
- mode: Clutter.AnimationMode.EASE_IN_QUAD,
- });
- },
- });
- },
- });
-}
-
function lerp(start, end, progress) {
return start + progress * (end - start);
}
const MessageTray = imports.ui.messageTray;
const Mpris = imports.ui.mpris;
const PopupMenu = imports.ui.popupMenu;
-const Util = imports.misc.util;
+const {ensureActorVisibleInScrollView} = imports.misc.animationUtils;
const {formatDateWithCFormatString, formatTimeSpan} = imports.misc.dateUtils;
const {loadInterfaceXML} = imports.misc.fileUtils;
'notify::can-clear', this._sync.bind(this),
'destroy', () => this._sectionList.remove_actor(section),
'message-focused', (_s, messageActor) => {
- Util.ensureActorVisibleInScrollView(this._scrollView, messageActor);
+ ensureActorVisibleInScrollView(this._scrollView, messageActor);
}, this);
this._sectionList.add_actor(section);
}
const ModalDialog = imports.ui.modalDialog;
const ShellEntry = imports.ui.shellEntry;
const CheckBox = imports.ui.checkBox;
-const Util = imports.misc.util;
+const {wiggle} = imports.misc.animationUtils;
var KeyringDialog = GObject.registerClass(
class KeyringDialog extends ModalDialog.ModalDialog {
});
this.prompt.connect('notify::warning', () => {
if (this._passwordEntry && this.prompt.warning !== '')
- Util.wiggle(this._passwordEntry);
+ wiggle(this._passwordEntry);
});
warningBox.add_child(warning);
const ModalDialog = imports.ui.modalDialog;
const ShellEntry = imports.ui.shellEntry;
const UserWidget = imports.ui.userWidget;
-const Util = imports.misc.util;
+const {wiggle} = imports.misc.animationUtils;
const DialogMode = {
AUTH: 0,
this._infoMessageLabel.hide();
this._nullMessageLabel.hide();
- Util.wiggle(this._passwordEntry);
+ wiggle(this._passwordEntry);
}
/* Try and authenticate again */
const St = imports.gi.St;
const Gettext = imports.gettext;
const SignalTracker = imports.misc.signalTracker;
+const {adjustAnimationTime} = imports.misc.animationUtils;
Gio._promisify(Gio.DataInputStream.prototype, 'fill_async');
Gio._promisify(Gio.DataInputStream.prototype, 'read_line_async');
// Prevent extensions from opening a display connection to ourselves
Gdk.set_allowed_backends('');
}
-
-// adjustAnimationTime:
-// @msecs: time in milliseconds
-//
-// Adjust @msecs to account for St's enable-animations
-// and slow-down-factor settings
-function adjustAnimationTime(msecs) {
- let settings = St.Settings.get();
-
- if (!settings.enable_animations)
- return 0;
- return settings.slow_down_factor * msecs;
-}
-
const ShellDBus = imports.ui.shellDBus;
const SmartcardManager = imports.misc.smartcardManager;
-const { adjustAnimationTime } = imports.ui.environment;
+const {adjustAnimationTime} = imports.misc.animationUtils;
const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
const LOCK_ENABLED_KEY = 'lock-enabled';
const Main = imports.ui.main;
const ParentalControlsManager = imports.misc.parentalControlsManager;
const RemoteSearch = imports.ui.remoteSearch;
-const Util = imports.misc.util;
+const {ensureActorVisibleInScrollView} = imports.misc.animationUtils;
const { Highlighter } = imports.misc.util;
}
_focusChildChanged(provider) {
- Util.ensureActorVisibleInScrollView(this._scrollView, provider.focusChild);
+ ensureActorVisibleInScrollView(this._scrollView, provider.focusChild);
}
_ensureProviderDisplay(provider) {
if (selected) {
result.add_style_pseudo_class('selected');
- Util.ensureActorVisibleInScrollView(this._scrollView, result);
+ ensureActorVisibleInScrollView(this._scrollView, result);
} else {
result.remove_style_pseudo_class('selected');
}
const ShellEntry = imports.ui.shellEntry;
const { loadInterfaceXML } = imports.misc.fileUtils;
-const Util = imports.misc.util;
+const {wiggle} = imports.misc.animationUtils;
var LIST_ITEM_ICON_SIZE = 48;
var WORK_SPINNER_ICON_SIZE = 16;
this._errorMessageLabel.text = _('Sorry, that didn’t work. Please try again.');
this._errorMessageLabel.opacity = 255;
- Util.wiggle(this._passwordEntry);
+ wiggle(this._passwordEntry);
}
_onCancelButton() {
projects / gnome-shell.git / commitdiff